Revert "Revert "Revert "Tweaks"""

This reverts commit d210affd5090b46c0815b83eab808ca0d603fe3c.