Further optimizations to CPU platform