Fixed some bad inheritance here