some fixes on WAC management