CAcorrect: inserted a few more size_t casts