2.0 fixes
2.0 settings cleanup