Fix Contacts provider (Getting There!!!)
More fixes