Minor update to check for arrays correctly.
More fixes around checks.