Cleanup our debug errors and add some more