Revert "Revert "Minor Tweaks""

This reverts commit 7cca146797349bd08bf8381da4cb808f4f128185.