Minor fixes for deployment on AWS

Minor fixes for deployment on AWS