Fix sgi-wsapi and sgi-luci to be standards compliant