Fixed URL expansion errors.