Minor performance changes