Some changes after checking on a fresh checkout #47