Tweaks to handling of window titles