Fixed up hive generation