More fixes for silly errors