fixes for windowstack