io8/fsa tweaks