Fixing file_entity and features compatibility