Small fix and logs