Logger + fix