* Various minor fixes.