Fixed more RPC errors introduced during merge with master

Change-Id: I1cc6b7b0e2d4685c14750c230a7d6d1d48279208