1.2.5 Support for ARC and a few minor changes