More work on IE7 compatibility