I think I also made these fixes, I will resolve conflicts.