Fix candidate issues