Fixed up conflicting code from multiple windows.