TS-2885 Fix experimental builds, and add DIST_SUBDIRS where needed