@Mossop so only thing that has changed since last pull is:

1. I've separated fs stuff and landed it successfully \o/
2. Order of setting event sink & opening an input stream has being swapped, this made a difference on my VMs so hopefully tinderbox will be happy as well.