Fixes from error mails