ie8 fixes
conflicts