More Logger fixes