Revert "small fixes"

This reverts commit d075fc8c42188457ecc5787b74e537843f7f0636.