Minor fixes, 8/18