Whoops! More fixes on CPU...