Fixing issue with 404s