Fix wrong type definitions