Minor updates
Revert "Minor updates"

This reverts commit 30ee8b90aa99d6369bb6f644bbe6f5323446a89f.
Odds and ends