Fixes for deploy