ensure we got an array back
Minor changes