Revert "Minor changes"

This reverts commit 42f1c93ffc4208d9a50a5b21ee7633657dd2325e.
Revert "Revert "Minor changes""

This reverts commit e9eb193df67b58ffefd3fc97ac4a856e3e6cf5bd.