Some work on deleting, fix for external browser.