mail fix and other