Fixed Mail. Other minor patches.