Fixed a bug in tracking mappings used
Fixed a bug in sex naming