final adjustments to make hive runnable