Various changes

x