Minor fixes, again.