API Bug tweaks and fixes