Some Email fix and other fixes