Added missing window references