Revert "Minor fixes"

This reverts commit 39767b9818866cd527998fbe121538650bc32fa9.