Fixed significant no-client build issue