Revert "Minor changes"

This reverts commit 1fb64b4756deb05ee77cdff10efbffbfeff933c3.
Revert "Revert "Minor changes""

This reverts commit 4edd3f62430735efbe6b169af8aa5e8368f2d706.