Revert "Minor fixes"

This reverts commit 8ca50f418e040ba8b322e83bcd1108036716ea56.