Fix some develop merge conflicts