Fixed parse and core data issues