More WPF fixup / cleanup.
Little more app startup cleanup.