consolidation, fixes and other adjustments