minor cran-type fixes