Merging final verify/sign fixes