Fixes to allow for simple root context in Deb