Fix constraints and insert