CFK - fix some preprocessing bugs