Cleaned up some 404 errors (still need to be polished)