Legacy code updates.