Remove unsigned/signed mismatches