More fixes for deploy process