Fixes for IE7+