Improved some debug/info messages