Logger bugs fix, already tested