Minor fixes for initial deployment