web commit by tschwinge: Two and a half issues.