more fixes for the data classes