Fix vars and upstart