Config file and header fix