Revert "Teeny fixes"

This reverts commit 6a7cae92c805ad8a6c55542de85c292a5927875c.