Some fixes for the evaluation version