Small optimizations
Merge branch '2.0'