More fixes for vanity stuff