misc data fixes