[rfpkg/f30: 8/8] minor changes