Fixing general path handling.