Various fixes. In graph in particular.
Also some PMD fixes.