More deploy fixes. Deferring DAEMON_OPTS to init.