Largely increase dragdrop hackyness to workaround issue #109