Small fixes

This will stop the dev environment emails.