Merging Pin fixes