Wishleague fixes