Bug fixes on sigs... Still a fix to come for sigs + attachments