FIX: various on flann