More wadl fixes

author: diane fleming
Merge pull request #38 from dian4554/bug-fix

More wadl fixes