Jansa/upstart

Fixes 2 QA issues in upstart