Fixed a couple SEGFAULTs