Back to blue square...
Fixed some segmentation faults