Log fix and display fix