fix issues with build files
fix normal tracing and system definition