Fixes for data