Revert "small fixes"

This reverts commit 0bdaf82e46a2ab5a7b16e9911831aec24a90389f.