Various minor changes & fixes.