Resolve some issues listed in the mail