Add candidate = 5 deployment fixes