Minor performance tweeks