Fixed array issues