Work on some old website merge requests to get them merged