Fixed missing types