Fixed up more issues