Fixed build problems which were cause my ARC being turned on