Fixes settings problems (fixes #4, fixes #5)