Undo array stride mutation
Fix bug for scalar to array assignment