Some updates to make debugging easier