few data fixes