Minor adjustments and fixes