Fix emails and stuff