Adding extra debugging for common issues