More use statement corrections.