More fixes
Merge branch 'master' of https://github.com/ganttly/COMP30005