Yet more non-controversial fixes from #2277

Fixing namespace handling + kubectl describe refactor
OK. Once we get to that point we can reevaluate and change this if it's not working.