Revert "Revert "Minor changes""

This reverts commit 697204731f1920851ff176a701aad47d1c32c974.
Revert "Revert "Minor changes""

This reverts commit 7a11a33d5fcc89065276eccf77d0bcb9c0f42139.
Revert "Minor changes"

This reverts commit 9fbafd62c84e7e2a83ae45d72e9ffe65d56b62f3.
Revert "Minor changes"

This reverts commit 3f208e481bd5970f1bdcf186dc3613335c447fb9.