Hive support related fixes