Small fix for IE8 & minor changes