Include Bruno's fixes