New types fixes