Some controller/path runner fixes.