Fix a few CPU bugs