1.9: Few optimizations