cpu-related fixes