WindowStack related improvements