Fix NPE
Finish sign support