P fix issues due to refactoring

ProtoIterator - lock created before thread
ProtoIterator - return for _next / _has_next
P: additional fix