IE7 workarounds and fixes
Merged