Minor updates to rate calculation logic.