Fixing pointers, local fixes.