Fixes

Fixing path generation;