Fixes for ES3 compatibility.