Debugging cleanups