More fixes per @indiesquidge