Tweaks (including GELAM changes for attachments)