Fixed a few improper casting warnings and updated some of syntax.
Merge branch 'refs/heads/ARC/develop' into ARC/master