Fixing path bugs