Fixing inconsitencies in base_force calculations