Add some more broken helpers, FIXME Roux (and Luis)