Fix review comments from @mathiasbynens