Fixing a few more cpu bugs