Fixed up system setup