some popup2 fixes