WIP: Fixes for various API issues

I'm working on fixes for some of the API issues I created a ticket for. This is the PR that collects all the fixes.