Logger fixes