Various minors fixes.