Fixed compile warnings, and data store methods