Fixing some things that I forgot to add when fixing the failed merge req...

...uest earlier in the sprint.