some other fixes and updates to work with upstart