Fix dataHelper bugs