Added and refined some rpc checks