More fixes for integer zero/blank values