Fixed some issues with IE8