Various changes to stuff