Small optimizations

Some small optimizations