Fixed some missing types