Minor nits and a warning fix.