Fixed some WAC bugs.