Fixes applied after testing in IE7/8