Fix some merge issues from the 6.7-dp-9 merge