Minor fixes again.