Fixes to hit association and x-cell size