Merge "Fix starting window problems." into jb-dev