Revert "Minor fixes"

This reverts commit 45b43ce58fb3a311ed4aa83c553f3ce39594d1b4.