Various changes to support IE