fixes for new data