Fix additional merge conflicts and remaining issues