Old xCode fixes