More fixes to DDL deployment