Fixes to pinning, and deployment