Fixed merge conflict

As well as some other minor changes...