Some repairs.

Still doesn't build