small fixes
Revert "small fixes"

This reverts commit d463f1924a825e2dabe3f2524fe7fc118e95b2b7.