Minor fixes for deploy