Ticket/master/pup 837 ffi windows sid

Minor updates...