Minor tweaks and signing