Some log statements in right places