Revert "Minor changes"

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

This reverts commit ff7f14e7fb1c5f2c581dcb8e99a0c4c09b0d6e5d.
Minro change