IE fix and minor adjustments