Minor dev tweaks

Some changes I had around while debugging the other issue I created :)