Various changes that I forgot to commit earlier