A couple consistency fixes