Fix issues with  (and hasOwnProperty)