Fixed up some parts