Fixes for FNA