Small changes & fixes.