fix compile issues from previous commits