Further permalink changes

Closes #71