We just put a small counterbore in the head or the block to clear the rivets. Then we never have to drill out the rivets.