More updates to fix compiler errors. Still some errors out there but
need to head home now.