More fixes per @jezdez's oversight