... And fix the other compile time issues in cmos_layout.bin support