Changes to build against ios7