Another few fixes to sharing mechanism from other computer, little cleanup