Fixups per review for minhq changes #51

Closed martinthomson closed 6 years ago