Fixed mistakes from merges