Fixes for pointer vs. array