Fixed few errors left from merging