logging: fixes + 2.6 compliance