More tiny optimizations