Adding fixes to popups