Finish conversion of Locking options