Fix some minor issues with PPAs overwriting each other