Repaired some uglyness from earlier!