Revert "Various small fixes;"

This reverts commit 8c40a2dce509f16ba0edf62c6216ce56ca1e196f.