* Minor adjustments