fixed a few more serializations per review feedback from  @astearns