Fix gotcha support (and some other bugs)