Small fix and update