More legacy code updates.