Fixed some merge conflicts that occured when SCOTT merged