Fixes CREATE and CONSTRAINTS conditions