Fixed some stuff that didn't merge correctly