Catchup some windows changes