small fixes
Revert "small fixes"

This reverts commit 2f378b4b1bb5b614da3bf50ec1fbc7b9e9f4d025.
another small fixes