Fixed some compile errors that appeared after an upgrade.