Merge Fix IE8 Problems

Merging fixes from original repo.