Fix debugging
Merge pull request #180 from ElementalAlchemist/last-minute-patches

Fix debugging