WYIL: very minor tweaks