Fixes for return array