Add debugging ifdefs to make it less verbose