Fix paths for some error pages
Merge branch 'dev'