Fixed all SIGSEGVs :D