Tweaks to debug and verbose modes