Preprocessor hotfixes.
Fixed kfold, couple of hotfixes before evaluator is implemented.