Window Container fixes