Testing & fixes.