some hive fixes