Minor code style changes
Getting debug info works again