Cleanups to avoid seg faults in future versions :)