Fixed Sig generation issues