Window|Refactor: Minor interface improvements