some automation fixes, hive path fix