Fix merge conflicts with latest master