Updates and improvements (tiny) to the RPC and model layers.