Fix some stuf in configuration