Fixed up hive generation yet again