libdisk: Another couple of Fun Factory changes