Moar small changes