Minor optimizations to CPU platform