Fix method call.
Fix validator merge errors.
Further syncronise with upstream repository.