Changes and fixes.