CPU Fixes as usual