FIx more gen level stuffs