Added fixes for deployment issues