Revert "A few minor changes"

This reverts commit b20746e27c48971a35f19070d2db632bb6bfabc3.