Small changes for a better Hive #1