Revert "Minor fixes"

This reverts commit ae7b437402a9f3737663ca53a5465f5644d91cf9.