Fixed errors due to using the wrong debug macros. Really need to remember to remake the entire project to catch these things before commiting.