Fixed config bug (among others)