Some fixes for data, more needed