Revert "Revert "Small updates""

This reverts commit 3449da44980a3bcc0a2e107132f1ea3adad1be13.