More wadl fixes

author: diane fleming