Constraint and Model Fixes