Some fixes to lose specific widgets