Fixed a few bugs with the API