Fix removal of Window trait