Minor performance updates