Fixed compile issues from master