Minor bugs in deployement