Fixed up more old code