Small fixes

the tiny fixes stripped out from my previous PR