Fixed some issues with IE7