Tracing and wayland fix