Fixes to Properly handle re-pinning, pin editing, etc. and reinstallations