sfs2 changes to reflect rpi changes