Fix internal -> v1beta3 round trip issues

Part of #1519, some round tripping behaviors do not function correctly.