Fixes for link popups