WYIL: minor tweaks