Revert "Small updates"

This reverts commit 73c99554563e86eea1b661140a99565b463ca5d3.
Revert "Revert "Small updates""

This reverts commit 7e3ca74e053b253acdfd8856e459c5b84a11107b.