Minor changes & fixes.