Minor build id cleanup