Minor performance tweaking