Fixes for emails