Fix vbfs_format compile errors
Merge branch 'master' into salmon_dev