Integration & fixes