Add some buggy window changes, will need to fix them.