Various deployment issues fixed