Revert "small fixes"

This reverts commit 1e5bce8b31e92e01145001bb57bfc213c27dd8f2.