Minor fixes, FCI matches test