fixes for enrichment on 32 bit machines.