ENH/FIX: address @ogrisel comments