Minor fixes illuminated by Wiki