CPU and fixes