Small changes to debug/error outputs