Fix up compile errors except cl.