same minor fixes