Some fixes for deploy initial.