v2.1.12 Small optimizations