Minor fixes for basic deployment