Fixing some things that I forgot to add when fixing the failed merge request earlier in the sprint.