IE bugfixes
Merge branch 'ie-bugfix'