Fix various configs