Fixed some broken bits from last commit