Changes meant to make it easy to find bugs