fix compilation issues from merge