Cosmetic fixes in preparation for RFC release

Signed-off-by: Todor Minchev <todor.minchev@intel.com>