Fix signed, unsigned mess