Persistance of Data. Small Fixes