Build fixes for Hive Contrib for clean build