Fix build issues from batlab. #4773