fixup issues passing hashes up instead of real objects