Fixes for trace logs¨