Bugfixes: API registration