Made some pointers default to null that I had undefined before