Revert "Further minor corrections"

This reverts commit 230192819620695dc07a2b7548760824061cd9df.