Added fixes for remote deploy
Added fixes for remote deploy