Changes to better support IE