Email bug fixes
Dbml bug fix