RC3. [#] some minor fixes