[#883] DDL fixes