Bug XXX - Small fixes.