Some small fixes and changes of nb version conversion