Patch up Hive 0.11 merge casualties.