More hadoop importer fixes