Various fixes

RIO-110
Merge pull request #21 in RIO/rio from RIO-110-fixes-sfdisk to master

* commit '5760ab7bdb6c8e3f036411c5bb04c1261d027d96':
  Various fixes