Fix for concurrent builds in claim integration

This patch fixes the claim integration, showing claims properly, when several builds are building concurrently.

The last pull request accidentally included more commits than I intended.