fixes on pop links