Fixes for from_array