Minor changes and fixes.