Fix minor issues and use master Swiftmailer branch