Improved diagnostic output