More permalink fixes