WYRL: more changes in relation to #274