Revert "Revert "Minor changes""

This reverts commit df1a9bb57dca1bf58c374c153da558a3ae58f8ac.