Fixes for WADL