Fixes for the email demos