Error fixes from emails