Slightly improve debuggabiity