Fixed some Deployment Issue