Hive support related fixes.