Minor fixes for deploy
Minor fixes for deploy
Merge commit
Deploy fixes