api and deploy tweaks