Made a few tweaks to the debug options