Fix problem with CROSS being undefined.