Fix cleanup issues, Catch window title updates