Minor performance improvement and Moz compatibility