Revert "Revert "Minor changes""

This reverts commit e8d2423d3572db15fc97912283e0e87c28f4a7cf.