Fixes for saving data using the class