Vanity fixes