Fix lock addresses