Some setting access fixes

I still need to figure out why the tests fail..