Connection fix, lock fix and option fix