fixes from wls testing