Fixed some broken stuff from last merge