Improved on a few Arrow related issues.