Minor fixes for deployment