Manual deploy: fixes