APM logs support, minor fixes