Enabled more debugging code