Some tweaks for debugging