Various changes that should be more coherent