WYIL: various minor tweaks