Partial version meanwhile fixing some failures.