minor WindowCommands changes