Minor changes to compute single offsets