Adjustments to AF tools.