Fixed some compile errors. Some remain.