Continual fixes for variable unitSize.