Fixed emails and other stuff