Bugs/wp

Fixes for IE11