API bugfix
Last minute fixes