Locks and CVs - All Fixed now