Popup and other small fixes