WYCS: yet more bug fixes