Fixed more stuff on CPU...