Fix errors and prepare first candidate