Small changes/fixes.