Fix hit mapping and etype handling