Bug fixes & email protection