bugid-93724 | WAM Api - small code fixes