CPU Gov Fix Ups