Adjustments and fixes.