Several minor changes