More permalink related changes.