Minor modifications to handle non-Honeybee files