small fixes from revert