More slight optimizations