moar cosmetic fixes