Fixed some of the core data warnings