New extensions and fixes.