Cleanup and fixes for compiler warnings
Slightly improve CPU trace files