Data Issues Fixed