Fixed config stuff