Fixes for affordance work.