Fixes to new classes in MercuryHCClient.