Reenable remaining build