Merge updates & fixes.