Revert "Revert "Minor local changes.""

This reverts commit 8e3b6c1f39948711b95eae00d51f1dcbdff5f7ff.
Revert "Minor local changes."

This reverts commit ded85a7cef32c2cbe5891070eb41b3b1fe8f06e3.