Fix conflicting types.