Fix various compilation due to package changes between master and branch (continued).