Revert "Minor changes"

This reverts commit e224a160ad8fbbdf3e671da7c754932c7cadd4fd.
Revert "Revert "Minor changes""

This reverts commit 1c3c1efaabd654e724d758a2553ab6ecab16edc3.