Fix issues with shift operator.