fix compilation errors due to double arrow changes.