Minor stuff. Now it compiles
Merge conflict. Did I mess up anything?