Fixes for the path generator