Adjustments and fixes