Making things a bit easier to debug