Clean up debug/error output for workaround