Fixes #206
Fixes #205

Also, default settings are now working for isolated storage