Fix pointers vs non-pointers