Fix review comments by mathiasbynens