Several general changes