Fixed some broken stuff