Adjustments to make debugging easier