Bugs in hilbert-marginal spectrum

Some fixes got dropped in merge for v0.5.3 - put them back in