FIXES: Correct issues revealed in BD Lab deployment