Optimizations for steamroller

Optimizations for steamroller