Add more fixes for run-time issues...

Address new constraint warning.

Add more nil-check fixes.

Add fix for array typing bug.