Cleanup index datatype conversions