Some slight optimizations