Some changes to sign code