Minor adjustments on previous commit