Some Fixes Popups