Some fixes to the way data paths are saved and settings are handled