Fix all compile errors. It's going to take a while to catch up with Tom.