Minor changes/fixes.