Error fixes.
Merge branch 'master' of github.com:anthony-kolesov/arc_testing