Fixed up some compile errors v1