Cleaning up schema problems
More entity schema fixes