Minor fixes
Revert "Minor fixes"

This reverts commit f57e3f2c6595ec3de47488329d12aeb5f606136e.