bPopup fixes