Improve some debug