Fix a couple of places that got missed in the conversion to using the new API