PatrolGRAPH fixes + other minor improvs