More fixes for 0 variance problems