misc: fix some minor style issues, fix SCOPE_TRACING compilation