Fix some container/window changes.