Spec fixes

Fixes for the Freemail spec