All ie fixes

Here it is again @zaach! Rebased from the current master.