Fix app, convert to ARC