Fix linking/dialogs