popup: small fixes