Fixes, more API functions