Fix build breakage after exclusive storage commits