Fix two bugs that prevented the "point to whole wadl" method from building