fixes for calcs