Fixed some pointer *shudder* issues

Fixed some pointer *shudder* issues