Few fixes to @MailSessionDefinition processing