Fix more (blind programming sucks!)