Misc fixes

Couple of trivial fixes while trying the latest master branch out.