Take latest commits from master to fix compilation errors