404 page and #12 fix