Small fix and lock versions