fixups from the migration of the experimental project