Fix a few more signs bugs