More ARC fixes.
Merge pull request #2 from bavarious/mergefixes

Fixes some leftover ARC issues