Small cleanup.
Moved debug to global settings