Fix a Couple Mixed Cluster Issues w/ Bucket Types

Fixes #492 & #493. 

For review, for now, testing by hand + running any existing tests (e.g. `btypes_eqc`) is the easiest way. I am working on extending the bucket types eqc test to cover these cases but didn't want to hold up this PR.