Fixes for deployment issues