Minor adjustments to fix