Some extra changes made on deployment