Fixed some Seg Faults