Edge-case fix, tentative-security, upstart problem