Fixed a couple issues with the base API implementation