Fix cunit compilation issues