Doc and Or() fixes