Fix some configurations