fixes on logging