Adds #ifdefs for debugging
Fixes macro errors