More engine code updates.