types fixes