Misc fixes for deploying to aws