Fix silly mistakes in #615 fix