Make CALC_SIZE work with -u
Some fixes regarding CALC_SIZE