Small fix + logs