A couple of tweaks to get this into production

If we can merge these two in for now, so I can check my cucumber chef tests are passing, that would be super! Will keep the branch running though, as this feature is still technically WIP