config: some fixes