More tweaks to DDL deployment