moar minor fixes

moar
even more minor fixes