Fixes for issue #694

Here the fixes for the broken title bar (window commands) issues at #694