Small fixes
Begining to use fl-paths