fixes to new window implementation

Found a couple unsupported edge cases to recent Window class updates.