Cosmetic fixes :lipstick: