more debugging fixes