Issue #141: Some further work on FLI (still broken)