Merge a few inconsistencies back from RPC