Another batch of changes in prehash