Misc changes for debugging