Some affinitii updates.