Fixes needed for local type of calculations