Correct return values and debug macros