moar small fixes