Fix default settings and setting bugs