Revert "Tiny tweaks"

This reverts commit 120a317632120c682c48366736fe5800e18c67a5.
Revert "Revert "Tiny tweaks""

This reverts commit fd5fafbdd7e6d2d49a3baa33bfe99cb3fd66e4d3.