Further tweaks to subtime extension