Added a few more logging calls