Fixed small bugs in API calls (FSB-12)