Crit fixes from PR 775, 784, 788