Fix Array/Number +/- deprecation warnings