Fixes for custom API contexts & updates to the server-side API