Changes to support running on Fuse 6.x