Revert "Small updates"

This reverts commit a683216a1c8bc3ff59b3c08fd71b9800a0ff543c.
Revert "Revert "Small updates""

This reverts commit c274b2cc7a160a52943e59a87699bd2a1fec9fb4.