More fixes to wadl

author: diane fleming