FIX: address @larsmans + @ogrisel comments