Solved few deployment issues