Removed dist cruft
Fixed compiler errors for ARC