Various changes

Various changes