Small fixes for deploy