Fix build-id handling