More optimizations

Just little ones.