Fixes for deploying