Improve log statements a bit