Fixed some stuff that was broken after a merge.