More fixes since the silly merge.