Moar minor updates